merge changes; conflicts fixed