Removed conflicts in Protein3DCanvas