Modify position and add logic to warning message
Resolve Conflict