synchro after merge error between master and upd

1. merged pull req from revolucas\master to trojanuch\master- OK
2. attempted to merge trojanuich\master to trojanuch\update on webpage -
FAILED ('failed to merge automatically')
3. attempted to merge trojanuch\master to trojanuch\update via GUI -
FAILED (error message)
4. after above operations it now allows me to manually commit changes
made by v0.6.0.5.3