Deleted unneeded merge conflict file
Code clean up
Custom button theme