random stuff
Added message box
Resolving conflicts