Removed conflicted code