Upprcase
remove letter
Fix conflict