Merging company files

@otlichnik - read this topic