Fixed the conflictissue which occured