Merge conflict
Cleaned up code and added notation for some logic in the application