Fixed a bug in production
Handled merge on first_file. Merged work X and Y
Added new feature
Finished work. Ready to merge into production.