merge changes and fix current appointment view