elementary - removed unintended conflicted lines
elementary - removed unintended conflicted lines

that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176

rvandegrift/elementary,FlorentRevest/Elementary,tasn/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,FlorentRevest/Elementary