fixed the conflicting code	

Change-Id: Ie262ab9f3d50d045e340dfa7bac895d75f1c7188