fix Conflicts Frm_Eleve.Designer

https://github.com/PPE1-7/PPE-SLAM/commit/e5ae4fe3ceccb38d9204e274aac84b5c24125c1c

https://github.com/PPE1-7/PPE-SLAM/commit/0c1be8e1f7ade385dd1118677baf6a28d43ca46b#diff-fe3a1821fe4e57d85787d362129a44d9