commited files after fixing conflicts