Ignore built native libraries
Fix merge errors